Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 21 Jun 2010 22:48:16 +0000 (22:48 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 21 Jun 2010 22:48:16 +0000 (22:48 +0000)
commit8c5ebf6a373cb8292c9ddbbd6cc03f7d11c1fbf3
treee4b0b16e4dcc77ae176e5ee94ac3927c45e68b6e
parent8e2e3b5b26bab2db80caee566cab3a3736d72077
parent1834c4dbe858c7e8aa7bd914c4f0558914474ce0
Merge from mainline.